js: Don't pass extra arguments to add_actor

It's clear that this was supposed to be passed to our own 'add' monkey
patch, but we missed. Remove the ignored arguments.

https://bugzilla.gnome.org/show_bug.cgi?id=680216

diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
index fb4ad22c6aa70b49a3e2f39d5cd4f3edb60eda1e..7fb8aeefdecae4c418e34a979ec12d7b6be3f277 100644 (file)
--- a/js/gdm/loginDialog.js
+++ b/js/gdm/loginDialog.js
@@ -284,11 +284,7 @@ const UserList = new Lang.Class({
         this._box = new St.BoxLayout({ vertical: true,
                                        style_class: 'login-dialog-user-list' });
 
-        this.actor.add_actor(this._box,
-                             { x_fill: true,
-                               y_fill: true,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
+        this.actor.add_actor(this._box);
         this._items = {};
 
         this.actor.connect('key-focus-in', Lang.bind(this, this._moveFocusToItems));
@@ -551,10 +547,7 @@ const SessionListItem = new Lang.Class({
 
         this._box = new St.BoxLayout({ style_class: 'login-dialog-session-list-item-box' });
 
-        this.actor.add_actor(this._box,
-                             { expand: true,
-                               x_fill: true,
-                               y_fill: true });
+        this.actor.add_actor(this._box);
         this.actor.connect('clicked', Lang.bind(this, this._onClicked));
 
         this._dot = new St.DrawingArea({ style_class: 'login-dialog-session-list-item-dot' });
@@ -565,10 +558,7 @@ const SessionListItem = new Lang.Class({
         let label = new St.Label({ style_class: 'login-dialog-session-list-item-label',
                                    text: name });
 
-        this._box.add_actor(label,
-                            { expand: true,
-                              x_fill: true,
-                              y_fill: true });
+        this._box.add_actor(label);
     },
 
     setShowDot: function(show) {
@@ -612,10 +602,7 @@ const SessionList = new Lang.Class({
                                        x_fill: true,
                                        y_fill: true });
         let box = new St.BoxLayout();
-        this._button.add_actor(box,
-                               { x_fill: true,
-                                 y_fill: true,
-                                 expand: true });
+        this._button.add_actor(box);
 
         this._triangle = new St.Label({ style_class: 'login-dialog-session-list-triangle',
                                         text: '\u25B8' });
@@ -623,30 +610,18 @@ const SessionList = new Lang.Class({
 
         let label = new St.Label({ style_class: 'login-dialog-session-list-label',
                                    text: _("Session...") });
-        box.add_actor(label,
-                      { x_fill: true,
-                        y_fill: true,
-                        expand: true });
+        box.add_actor(label);
 
         this._button.connect('clicked',
                              Lang.bind(this, this._onClicked));
-        this._box.add_actor(this._button,
-                            { x_fill: true,
-                              y_fill: true,
-                              expand: true });
+        this._box.add_actor(this._button);
         this._scrollView = new St.ScrollView({ style_class: 'login-dialog-session-list-scroll-view'});
         this._scrollView.set_policy(Gtk.PolicyType.NEVER,
                                     Gtk.PolicyType.AUTOMATIC);
-        this._box.add_actor(this._scrollView,
-                            { x_fill: true,
-                              y_fill: true,
-                              expand: true });
+        this._box.add_actor(this._scrollView);
         this._itemList = new St.BoxLayout({ style_class: 'login-dialog-session-item-list',
                                             vertical: true });
-        this._scrollView.add_actor(this._itemList,
-                                   { x_fill: true,
-                                     y_fill: true,
-                                     expand: true });
+        this._scrollView.add_actor(this._itemList);
         this._scrollView.hide();
         this.isOpen = false;
         this._populate();
@@ -714,11 +689,7 @@ const SessionList = new Lang.Class({
             let [sessionName, sessionDescription] = Gdm.get_session_name_and_description(ids[i]);
 
             let item = new SessionListItem(ids[i], sessionName);
-            this._itemList.add_actor(item.actor,
-                              { x_align: St.Align.START,
-                                y_align: St.Align.START,
-                                x_fill: true,
-                                y_fill: true });
+            this._itemList.add_actor(item.actor);
             this._items[ids[i]] = item;
 
             if (!this._activeSessionId)

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 170df51f7a8470909c0c23dcf76c1eaa44699173..28f4a44ce5f23e671734d370705922fda40daf45 100644 (file)
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -279,11 +279,7 @@ const EndSessionDialog = new Lang.Class({
         scrollView.hide();
 
         this._applicationList = new St.BoxLayout({ vertical: true });
-        scrollView.add_actor(this._applicationList,
-                             { x_fill:  true,
-                               y_fill:  true,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
+        scrollView.add_actor(this._applicationList);
 
         this._applicationList.connect('actor-added',
                                       Lang.bind(this, function() {

diff --git a/js/ui/shellMountOperation.js b/js/ui/shellMountOperation.js
index f65b74edf0fb481751e3f4a0eaf8a8a7176c168a..f524a132284f584b5c77b7d3789cc51cf9b9e9cc 100644 (file)
--- a/js/ui/shellMountOperation.js
+++ b/js/ui/shellMountOperation.js
@@ -470,11 +470,7 @@ const ShellProcessesDialog = new Lang.Class({
         scrollView.hide();
 
         this._applicationList = new St.BoxLayout({ vertical: true });
-        scrollView.add_actor(this._applicationList,
-                             { x_fill:  true,
-                               y_fill:  true,
-                               x_align: St.Align.START,
-                               y_align: St.Align.MIDDLE });
+        scrollView.add_actor(this._applicationList);
 
         this._applicationList.connect('actor-added',
                                       Lang.bind(this, function() {